imx: Configure CAAM job rings master ID for i.MX8MQ

For i.MX8MQ B0 revision the default configuration of JRaMID is not valid
to allow the kernel to use the CAAM job rings. This patch sets the
master ID of the Cortex A in the JRaMID registers.

Signed-off-by: Chris Spencer <[email protected]>

diff --git a/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c b/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c
index b18edd96d1b5833bced178d7552363b01316ee1c..99fa9807af0875c87cdb43bb3bc5299f15a74805 100644 (file)
--- a/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c
+++ b/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c
@@ -84,6 +84,11 @@ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,
                mmio_write_32(IMX_CSU_BASE + i * 4, 0xffffffff);
        }
 
+       /* config CAAM JRaMID set MID to Cortex A */
+       mmio_write_32(CAAM_JR0MID, CAAM_NS_MID);
+       mmio_write_32(CAAM_JR1MID, CAAM_NS_MID);
+       mmio_write_32(CAAM_JR2MID, CAAM_NS_MID);
+
 #if DEBUG_CONSOLE
        static console_uart_t console;
 

diff --git a/plat/imx/imx8m/imx8mq/include/platform_def.h b/plat/imx/imx8m/imx8mq/include/platform_def.h
index 4957582ad981b739ba0f9492aee7dbe19a2249b3..5c5b0a5f9fe30da8547394140e7170d6786893d4 100644 (file)
--- a/plat/imx/imx8m/imx8mq/include/platform_def.h
+++ b/plat/imx/imx8m/imx8mq/include/platform_def.h
@@ -119,3 +119,8 @@
 #define DEBUG_CONSOLE                  0
 #define IMX_WDOG_B_RESET
 #define PLAT_IMX8M                     1
+
+#define CAAM_JR0MID                    U(0x30900010)
+#define CAAM_JR1MID                    U(0x30900018)
+#define CAAM_JR2MID                    U(0x30900020)
+#define CAAM_NS_MID                    U(0x1)